Repository navigation
Conversation
Unanswered root requests and expired paths trigger earlier retries, reducing reconnection delays after sleep or network changes. Reply tracking distinguishes delayed replies from replies to newer requests. Recovery completes after accepting the reply path.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Note
This pull request was prepared using AI. I've reviewed the patch and tried to keep it clean, but I admit the ZeroTier codebase is outside my expertise.
After waking from sleep or changing networks, ZeroTier can send a connection request (HELLO) before internet access returns. A saved path to a root server can then delay the next request by nearly four minutes.
This change retries sooner when a scheduled connection request goes unanswered or saved paths expire. It compares the send times in direct replies, so a delayed reply cannot acknowledge a newer scheduled request.
Tradeoffs
Recovery starts the five-second root retry cycle earlier, including after a lost reply. Upstream already uses this cycle when no saved paths remain. It sends requests to known IPv4 and IPv6 endpoints and probes saved paths; machines with several network interfaces may send extra copies.
Tests
One automated test simulates a lost request after sleep, followed by an old reply. It checks that ZeroTier reconnects promptly and avoids extra requests during healthy idle periods before and after recovery.
Related: #2082.